From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 23 Jun 2009 10:11:46 +0000 (+0100)
Subject: x86: Another assign_irq_vector() cleanup.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13718
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=9e0883cae65aed8c737d9f67e0cdc98e765ae586;p=xen.git

x86: Another assign_irq_vector() cleanup.

Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
---

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 42e2b9d0ea..b0591c1827 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -84,15 +84,9 @@ int assign_irq_vector(int irq)
 
     spin_lock(&vector_lock);
 
-    if ((irq != AUTO_ASSIGN_IRQ) && !IO_APIC_IRQ(irq))
-    {
-        spin_unlock(&vector_lock);
-        return LEGACY_VECTOR(irq);
-    }
-
-    if ((irq != AUTO_ASSIGN_IRQ) && (IO_APIC_VECTOR(irq) > 0)) {
+    if ((irq != AUTO_ASSIGN_IRQ) && (irq_to_vector(irq) > 0)) {
         spin_unlock(&vector_lock);
-        return IO_APIC_VECTOR(irq);
+        return irq_to_vector(irq);
     }
 
     vector = current_vector;